diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 0bb91ba..da88204 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1276,7 +1276,8 @@
 
 		foreach ($key as $k => $v)
 		{
-			$this->qb_set[$this->protect_identifiers($k, FALSE, $escape)] = $this->escape($v);
+			$this->qb_set[$this->protect_identifiers($k, FALSE, $escape)] = ($escape)
+				? $this->escape($v) : $v;
 		}
 
 		return $this;
@@ -1515,9 +1516,15 @@
 
 			ksort($row); // puts $row in the same order as our keys
 
-			foreach ($row as $k => $v)
+			if ($escape !== FALSE)
 			{
-				$row[$k] = $this->escape($v);
+				$clean = array();
+				foreach ($row as $value)
+				{
+					$clean[] = $this->escape($value);
+				}
+
+				$row = $clean;
 			}
 
 			$this->qb_set[] = '('.implode(',', $row).')';
@@ -1938,7 +1945,7 @@
 					$index_set = TRUE;
 				}
 
-				$clean[$this->protect_identifiers($k2, FALSE, $escape)] = $this->escape($v2);
+				$clean[$this->protect_identifiers($k2, FALSE, $escape)] = ($escape === FALSE) ? $v2 : $this->escape($v2);
 			}
 
 			if ($index_set === FALSE)